Update btrCore.c by tharun-kumarv · Pull Request #39 · rdkcentral/bluetooth

tharun-kumarv · 2026-02-10T07:19:34Z

Reason for change: Debug purpose for coverity
Test Procedure: Check ticket description

Risks: Medium
Priority: P1

github-actions · 2026-02-10T07:19:45Z

Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.

I have read the CLA Document and I hereby sign the CLA

_{You can retrigger this bot by commenting recheck in this Pull Request.}_{Posted by the CLA Assistant Lite bot.}

Copilot

Pull request overview

Adds Xbox Gen3 controller detection (via MAC OUI matching) to override devices whose advertised name equals their MAC address, enabling an immediate/meaningful UI name during discovery.

Changes:

Add Xbox Gen3 OUI constants/list and a helper (btrCore_IsXboxGen3Gamepad) to detect matching devices by MAC prefix.
Update btrCore_BTDeviceStatusUpdateCb to replace the device name with "Xbox Wireless Controller" when the name equals the address and the OUI matches.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-10T07:23:58Z

src/btrCore.c

+				/* Xbox Gen3 exception: force immediate UI update with a temporary name */
+               if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&
+                   btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {
+                   errno_t rc;
+                     rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                     rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                   BTRCORELOG_INFO("Gen3 detected by OUI; forcing UI update with temporary name for %s\n",FoundDevice.pcDeviceAddress);


This change introduces new behavioral logic (Xbox Gen3 OUI detection that mutates pcName to force an immediate UI update), but the existing unit tests for btrCore_BTDeviceStatusUpdateCb don’t appear to exercise this branch. Please add a test case where deviceInfo.pcName initially equals deviceInfo.pcAddress and the address matches one of the new OUIs, and assert that the callback updates the name as expected.

Copilot · 2026-02-10T07:23:58Z

src/btrCore.c

+				/* Xbox Gen3 exception: force immediate UI update with a temporary name */
+               if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&
+                   btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {


PR description says this is for "Debug purpose for coverity", but the diff adds product behavior (new Xbox Gen3 OUI list + forcing device name updates). Please update the PR description to reflect the actual functional change and expected user impact, or gate this logic behind a debug/diagnostic flag if it’s intended to be temporary.

Copilot · 2026-02-10T07:23:58Z

src/btrCore.c

+                     rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                     rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");


In the new Xbox Gen3 block, strcpy_s is called with BD_NAME_LEN as the destination size for both FoundDevice.pcDeviceName and apstBTDeviceInfo->pcName. FoundDevice.pcDeviceName is sized BD_NAME_LEN + 1 and apstBTDeviceInfo->pcName is BT_MAX_STR_LEN, so passing BD_NAME_LEN is an incorrect/needlessly small bound and can turn future string changes into runtime-constraint failures. Prefer passing the actual destination buffer size (e.g., sizeof(FoundDevice.pcDeviceName) / sizeof(apstBTDeviceInfo->pcName) or the correct constant including the NUL).

Suggested change

rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");

ERR_CHK(rc);

rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");

rc = strcpy_s(FoundDevice.pcDeviceName, sizeof(FoundDevice.pcDeviceName), "Xbox Wireless Controller");

ERR_CHK(rc);

rc = strcpy_s(apstBTDeviceInfo->pcName, sizeof(apstBTDeviceInfo->pcName), "Xbox Wireless Controller");

Copilot · 2026-02-10T07:23:58Z

src/btrCore.c

+				/* Xbox Gen3 exception: force immediate UI update with a temporary name */
+               if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&
+                   btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {
+                   errno_t rc;
+                     rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                     rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                   BTRCORELOG_INFO("Gen3 detected by OUI; forcing UI update with temporary name for %s\n",FoundDevice.pcDeviceAddress);
+                   }
+


The indentation/bracing in the new Xbox Gen3 exception block is inconsistent with the surrounding code (mixed tab/space at the comment line and misaligned closing brace). Please reformat this block to match the file’s existing indentation so it’s easier to read and avoids diffs caused by whitespace-only changes later.

Suggested change

/* Xbox Gen3 exception: force immediate UI update with a temporary name */

if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&

btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {

errno_t rc;

rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");

ERR_CHK(rc);

rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");

ERR_CHK(rc);

BTRCORELOG_INFO("Gen3 detected by OUI; forcing UI update with temporary name for %s\n",FoundDevice.pcDeviceAddress);

}

/* Xbox Gen3 exception: force immediate UI update with a temporary name */

if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&

btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {

errno_t rc;

rc = strcpy_s(FoundDevice.pcDeviceName, BD_NAME_LEN, "Xbox Wireless Controller");

ERR_CHK(rc);

rc = strcpy_s(apstBTDeviceInfo->pcName, BD_NAME_LEN, "Xbox Wireless Controller");

ERR_CHK(rc);

BTRCORELOG_INFO("Gen3 detected by OUI; forcing UI update with temporary name for %s\n", FoundDevice.pcDeviceAddress);

}

rdkcmf-jenkins · 2026-02-10T07:29:59Z

src/btrCore.c

+               if (btrCore_IsDevNameSameAsAddress(&FoundDevice) &&
+                   btrCore_IsXboxGen3Gamepad(FoundDevice.pcDeviceAddress)) {
+                   errno_t rc;
+                     rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");


Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""Xbox Wireless Controller" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""Xbox Wireless Controller"" formerly declared as a pointer?

rdkcmf-jenkins · 2026-02-10T07:29:59Z

src/btrCore.c

+                     rc = strcpy_s(FoundDevice.pcDeviceName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                     rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");


Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""Xbox Wireless Controller" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""Xbox Wireless Controller"" formerly declared as a pointer?

rdkcmf-jenkins · 2026-02-10T07:29:59Z

src/btrCore.c

+                     rc = strcpy_s(apstBTDeviceInfo->pcName,BD_NAME_LEN,"Xbox Wireless Controller");
+                     ERR_CHK(rc);
+
+                   BTRCORELOG_INFO("Gen3 detected by OUI; forcing UI update with temporary name for %s\n",FoundDevice.pcDeviceAddress);


Coverity Issue - String not null terminated

Passing unterminated string "FoundDevice.pcDeviceAddress" to "fprintf", which expects a null-terminated string.

High Impact, CWE-170
STRING_NULL

Update btrCore.c

e3245aa

tharun-kumarv requested a review from a team as a code owner February 10, 2026 07:19

Copilot AI review requested due to automatic review settings February 10, 2026 07:19

Copilot started reviewing on behalf of tharun-kumarv February 10, 2026 07:19 View session

Copilot AI reviewed Feb 10, 2026

View reviewed changes

rdkcmf-jenkins reviewed Feb 10, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update btrCore.c#39

Update btrCore.c#39
tharun-kumarv wants to merge 1 commit intodevelopfrom
test-cov

tharun-kumarv commented Feb 10, 2026

Uh oh!

github-actions bot commented Feb 10, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 10, 2026

Uh oh!

Copilot AI Feb 10, 2026

Uh oh!

Copilot AI Feb 10, 2026

Uh oh!

Copilot AI Feb 10, 2026

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

tharun-kumarv commented Feb 10, 2026

Uh oh!

github-actions bot commented Feb 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Choose a reason for hiding this comment

Coverity Issue - Array compared against 0

How to fix

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Choose a reason for hiding this comment

Coverity Issue - Array compared against 0

How to fix

Uh oh!

rdkcmf-jenkins Feb 10, 2026

Choose a reason for hiding this comment

Coverity Issue - String not null terminated

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants